From 6732ea1faccc4797663d50ecc73a7f761836de48 Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 21 Jul 2009 15:47:41 +0100
Subject: [PATCH] xsm: Move ACM_DEBUG and printkd() out of public header. They
 are private to the ACM implementation within Xen.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---
 xen/include/public/xsm/acm.h    | 12 ------------
 xen/include/xsm/acm/acm_hooks.h | 13 ++++++++++++-
 xen/xsm/acm/acm_core.c          |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/xen/include/public/xsm/acm.h b/xen/include/public/xsm/acm.h
index 48cd1062c7..b6ac8d5130 100644
--- a/xen/include/public/xsm/acm.h
+++ b/xen/include/public/xsm/acm.h
@@ -28,18 +28,6 @@
 
 #include "../xen.h"
 
-/* if ACM_DEBUG defined, all hooks should
- * print a short trace message (comment it out
- * when not in testing mode )
- */
-/* #define ACM_DEBUG */
-
-#ifdef ACM_DEBUG
-#  define printkd(fmt, ...) printk(fmt, ##__VA_ARGS__)
-#else
-#  define printkd(fmt, ...)
-#endif
-
 /* default ssid reference value if not supplied */
 #define ACM_DEFAULT_SSID  0x0
 #define ACM_DEFAULT_LOCAL_SSID  0x0
diff --git a/xen/include/xsm/acm/acm_hooks.h b/xen/include/xsm/acm/acm_hooks.h
index 19e37f9e2e..67bd49f570 100644
--- a/xen/include/xsm/acm/acm_hooks.h
+++ b/xen/include/xsm/acm/acm_hooks.h
@@ -130,11 +130,22 @@ extern struct acm_operations *acm_secondary_ops;
 /* #define ACM_TRACE_MODE */
 
 #ifdef ACM_TRACE_MODE
-# define traceprintk(fmt, args...) printk(fmt,## args)
+# define traceprintk(fmt, args...) printk(fmt, ## args)
 #else
 # define traceprintk(fmt, args...)
 #endif
 
+/* if ACM_DEBUG defined, all hooks should
+ * print a short trace message (comment it out
+ * when not in testing mode )
+ */
+/* #define ACM_DEBUG */
+
+#ifdef ACM_DEBUG
+#  define printkd(fmt, args...) printk(fmt, ## args)
+#else
+#  define printkd(fmt, args...)
+#endif
 
 #ifndef ACM_SECURITY
 
diff --git a/xen/xsm/acm/acm_core.c b/xen/xsm/acm/acm_core.c
index 3133877cf4..b8b7b4f59c 100644
--- a/xen/xsm/acm/acm_core.c
+++ b/xen/xsm/acm/acm_core.c
@@ -38,7 +38,7 @@
  *   define/undefine this constant to receive / suppress any
  *   security hook debug output of sHype
  *
- *   include/public/xsm/acm.h defines a constant ACM_DEBUG
+ *   include/xsm/acm/acm_hooks.h defines a constant ACM_DEBUG
  *   define/undefine this constant to receive non-hook-related
  *   debug output.
  */
-- 
2.30.2